More Windows-specific C->C++ explicit casts.

diff --git a/gpsbabel/jeeps/gpsserial.cc b/gpsbabel/jeeps/gpsserial.cc
index 8afd4eb09df15efe026707a0cb829ee1a89ceaaa..68c4d028dfca1309a5a3349d528d6961dcace803 100644 (file)
--- a/gpsbabel/jeeps/gpsserial.cc
+++ b/gpsbabel/jeeps/gpsserial.cc
@@ -90,7 +90,7 @@ int32 GPS_Serial_On(const char* port, gpsdevh** dh)
   COMMTIMEOUTS timeout;
   HANDLE comport;
   const char* xname = fix_win_serial_name(port);
-  win_serial_data* wsd = xcalloc(sizeof(win_serial_data), 1);
+  win_serial_data* wsd = (win_serial_data*) xcalloc(sizeof(win_serial_data), 1);
   *dh = (gpsdevh*) wsd;
   GPS_Diag("Opening %s\n", xname);
   comport = CreateFileA(xname, GENERIC_READ|GENERIC_WRITE, 0, NULL,

diff --git a/gpsbabel/jeeps/gpsusbwin.cc b/gpsbabel/jeeps/gpsusbwin.cc
index 34bf9168c9631a765c9984f1038989fe10b7d086..2567a87e1f3266cdfcca55c7f986afa14404d624 100644 (file)
--- a/gpsbabel/jeeps/gpsusbwin.cc
+++ b/gpsbabel/jeeps/gpsusbwin.cc
@@ -53,7 +53,7 @@ typedef struct {
   int booger;
 } winusb_unit_data;
 
-static HANDLE* usb_handle = INVALID_HANDLE_VALUE;
+static HANDLE usb_handle = INVALID_HANDLE_VALUE;
 static int usb_tx_packet_size ;
 static const gdx_info* gdx;
 
@@ -133,7 +133,7 @@ static gusb_llops_t win_llops = {
 };
 
 static
-HANDLE* garmin_usb_start(HDEVINFO* hdevinfo, SP_DEVICE_INTERFACE_DATA* infodata)
+HANDLE garmin_usb_start(HDEVINFO hdevinfo, SP_DEVICE_INTERFACE_DATA* infodata)
 {
   DWORD size;
   PSP_INTERFACE_DEVICE_DETAIL_DATA pdd = NULL;
@@ -142,7 +142,7 @@ HANDLE* garmin_usb_start(HDEVINFO* hdevinfo, SP_DEVICE_INTERFACE_DATA* infodata)
   SetupDiGetDeviceInterfaceDetail(hdevinfo, infodata,
                                   NULL, 0, &size, NULL);
 
-  pdd = xmalloc(size);
+  pdd = (PSP_INTERFACE_DEVICE_DETAIL_DATA) xmalloc(size);
   pdd->cbSize = sizeof(SP_INTERFACE_DEVICE_DETAIL_DATA);
 
   devinfo.cbSize = sizeof(SP_DEVINFO_DATA);
@@ -191,14 +191,14 @@ static char** get_garmin_mountpoints(void)
 #define BUFSIZE 512
   TCHAR szTemp[MAX_PATH];
   char* p = szTemp;
-  char** dlist = xmalloc(sizeof(*dlist));
+  char** dlist = (char **) xmalloc(sizeof(*dlist));
 
   int i = 0;
   dlist[0] = NULL;
 
   if (GetLogicalDriveStringsA(BUFSIZE-1, szTemp)) {
     while (*p) {
-      dlist = xrealloc(dlist, sizeof(*dlist) * (++i + 1));
+      dlist = (char **) xrealloc(dlist, sizeof(*dlist) * (++i + 1));
       //            fprintf(stderr, "Found: %d, %s\n", i, p);
       dlist[i-1] = xstrdup(p);
       dlist[i] = NULL;
@@ -223,7 +223,7 @@ gusb_init(const char* pname, gpsdevh** dh)
   HDEVINFO hdevinfo;
   SP_DEVICE_INTERFACE_DATA devinterface;
 
-  winusb_unit_data* wud = xcalloc(sizeof(winusb_unit_data), 1);
+  winusb_unit_data* wud = (winusb_unit_data*) xcalloc(sizeof(winusb_unit_data), 1);
   *dh = (gpsdevh*) wud;
 
   gusb_register_ll(&win_llops);